From: Keir Fraser <keir.fraser@citrix.com>
Date: Thu, 25 Feb 2010 21:03:26 +0000 (+0000)
Subject: x86 numa: Fix post-boot ACPI SLIT accesses.
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~12559
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success//%22http:/www.example.com/cgi/success/?a=commitdiff_plain;h=387d25611007aa702df6c3c78fdcaaf7644947e7;p=xen.git

x86 numa: Fix post-boot ACPI SLIT accesses.

Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
---

diff --git a/xen/arch/x86/srat.c b/xen/arch/x86/srat.c
index 9da11f7b0e..2060ff78cc 100644
--- a/xen/arch/x86/srat.c
+++ b/xen/arch/x86/srat.c
@@ -140,11 +140,22 @@ static __init int slit_valid(struct acpi_table_slit *slit)
 /* Callback for SLIT parsing */
 void __init acpi_numa_slit_init(struct acpi_table_slit *slit)
 {
+#ifdef CONFIG_X86_64
+	unsigned long mfn;
 	if (!slit_valid(slit)) {
-		printk(KERN_INFO "ACPI: SLIT table looks invalid. Not used.\n");
+		printk(KERN_INFO "ACPI: SLIT table looks invalid. "
+		       "Not used.\n");
+		return;
+	}
+	mfn = alloc_boot_pages(PFN_UP(slit->header.length), 1);
+	if (!mfn) {
+		printk(KERN_ERR "ACPI: Unable to allocate memory for "
+		       "saving ACPI SLIT numa information.\n");
 		return;
 	}
-	acpi_slit = slit;
+	acpi_slit = mfn_to_virt(mfn);
+	memcpy(acpi_slit, slit, slit->header.length);
+#endif
 }
 
 /* Callback for Proximity Domain -> LAPIC mapping */